Further updates from the GtkPrintContext functions rename.

2006-05-31  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtk.symbols:
	* demos/gtk-demo/printing.c:
	* tests/print-editor.c:
	* tests/testnouiprint.c:
	* tests/testprint.c:
	* tests/testprintfileoperation.c:
	Further updates from the GtkPrintContext functions rename.

	* modules/printbackends/cups/gtkcupsutils.c:
	Always set requesting-user-name when doing cups requests.

diff --git a/ChangeLog b/ChangeLog
index 600cb74c529b0f442c334ce499c0d56836721db7..b2829ea2d6bd342df433349c214916200d2ef905 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-31  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtk.symbols:
+       * demos/gtk-demo/printing.c:
+       * tests/print-editor.c:
+       * tests/testnouiprint.c:
+       * tests/testprint.c:
+       * tests/testprintfileoperation.c:
+       Further updates from the GtkPrintContext functions rename.
+       
+       * modules/printbackends/cups/gtkcupsutils.c:
+       Always set requesting-user-name when doing cups requests.
+
 2006-05-31  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkpagesetupunixdialog.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 600cb74c529b0f442c334ce499c0d56836721db7..b2829ea2d6bd342df433349c214916200d2ef905 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2006-05-31  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtk.symbols:
+       * demos/gtk-demo/printing.c:
+       * tests/print-editor.c:
+       * tests/testnouiprint.c:
+       * tests/testprint.c:
+       * tests/testprintfileoperation.c:
+       Further updates from the GtkPrintContext functions rename.
+       
+       * modules/printbackends/cups/gtkcupsutils.c:
+       Always set requesting-user-name when doing cups requests.
+
 2006-05-31  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkpagesetupunixdialog.c:

diff --git a/demos/gtk-demo/printing.c b/demos/gtk-demo/printing.c
index 4ddeeaa148df37ec5b2ebbb1f6b9d290f628fa2e..63d5142b5d4ed0624aaa1adc792f253cd02f71eb 100644 (file)
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -66,7 +66,7 @@ draw_page (GtkPrintOperation *operation,
   PangoFontDescription *desc;
   gchar *page_str;
 
-  cr = gtk_print_context_get_cairo (context);
+  cr = gtk_print_context_get_cairo_context (context);
   width = gtk_print_context_get_width (context);
 
   cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
@@ -78,7 +78,7 @@ draw_page (GtkPrintOperation *operation,
   cairo_set_line_width (cr, 1);
   cairo_stroke (cr);
 
-  layout = gtk_print_context_create_layout (context);
+  layout = gtk_print_context_create_pango_layout (context);
 
   desc = pango_font_description_from_string ("sans 14");
   pango_layout_set_font_description (layout, desc);
@@ -104,7 +104,7 @@ draw_page (GtkPrintOperation *operation,
   
   g_object_unref (layout);
   
-  layout = gtk_print_context_create_layout (context);
+  layout = gtk_print_context_create_pango_layout (context);
   
   desc = pango_font_description_from_string ("mono");
   pango_font_description_set_size (desc, data->font_size * PANGO_SCALE);

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index a703ffe1f236b31a9421f872106f03b841f33b1e..7e2af3117d49afc9bef72b2d99fc17c8f46c29cf 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2569,15 +2569,15 @@ gtk_print_backend_load_modules
 #if IN_HEADER(__GTK_PRINT_CONTEXT_H__)
 #if IN_FILE(__GTK_PRINT_CONTEXT_C__)
 gtk_print_context_get_type G_GNUC_CONST
-gtk_print_context_get_cairo
+gtk_print_context_get_cairo_context
 gtk_print_context_get_page_setup
 gtk_print_context_get_width
 gtk_print_context_get_height
 gtk_print_context_get_dpi_x
 gtk_print_context_get_dpi_y
-gtk_print_context_get_fontmap
-gtk_print_context_create_context
-gtk_print_context_create_layout
+gtk_print_context_get_pango_fontmap
+gtk_print_context_create_pango_context
+gtk_print_context_create_pango_layout
 #endif
 #endif
 

diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c
index 2ebf4a785f4894ac63903a0398812147d52af4de..32503feab3e542fe0f215dd6f8593a4d9035a0ec 100644 (file)
--- a/modules/printbackends/cups/gtkcupsutils.c
+++ b/modules/printbackends/cups/gtkcupsutils.c
@@ -151,6 +151,10 @@ gtk_cups_request_new (http_t *connection,
                                    "attributes-natural-language", 
                                    NULL, language->language);
 
+  gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                                   "requesting-user-name",
+                                   NULL, cupsUser());
+  
   cupsLangFree (language);
 
   return request;

diff --git a/tests/print-editor.c b/tests/print-editor.c
index eff83c583bffdd98b6ceb548dab354e5e7523cef..c49ede459bb7cd1a038f0143290c3f33c689ec46 100644 (file)
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -265,7 +265,7 @@ begin_print (GtkPrintOperation *operation,
   width = gtk_print_context_get_width (context);
   height = gtk_print_context_get_height (context);
 
-  print_data->layout = gtk_print_context_create_layout (context);
+  print_data->layout = gtk_print_context_create_pango_layout (context);
 
   desc = pango_font_description_from_string (print_data->font);
   pango_layout_set_font_description (print_data->layout, desc);
@@ -331,7 +331,7 @@ draw_page (GtkPrintOperation *operation,
   else
     end = GPOINTER_TO_INT (pagebreak->data);
     
-  cr = gtk_print_context_get_cairo (context);
+  cr = gtk_print_context_get_cairo_context (context);
 
   cairo_set_source_rgb (cr, 0, 0, 0);
   

diff --git a/tests/testnouiprint.c b/tests/testnouiprint.c
index c640063b20da09ae70f9bfecdca91fdd9a2a3b96..cf73fd03ed754a5a0582bbccea542cf777ee0bab 100644 (file)
--- a/tests/testnouiprint.c
+++ b/tests/testnouiprint.c
@@ -31,7 +31,7 @@ draw_page (GtkPrintOperation *operation,
   PangoLayout *layout;
   PangoFontDescription *desc;
   
-  cr = gtk_print_context_get_cairo (context);
+  cr = gtk_print_context_get_cairo_context (context);
 
   /* Draw a red rectangle, as wide as the paper (inside the margins) */
   cairo_set_source_rgb (cr, 1.0, 0, 0);
@@ -54,7 +54,7 @@ draw_page (GtkPrintOperation *operation,
 
   /* Draw some text */
   
-  layout = gtk_print_context_create_layout (context);
+  layout = gtk_print_context_create_pango_layout (context);
   pango_layout_set_text (layout, "Hello World! Printing is easy", -1);
   desc = pango_font_description_from_string ("sans 28");
   pango_layout_set_font_description (layout, desc);

diff --git a/tests/testprint.c b/tests/testprint.c
index 4326a8062d6599567602a77f2c373b418efb5eb9..5ff3489e71e27ab631bf93f75ed5723ab974fb23 100644 (file)
--- a/tests/testprint.c
+++ b/tests/testprint.c
@@ -51,7 +51,7 @@ draw_page (GtkPrintOperation *operation,
   PangoLayout *layout;
   PangoFontDescription *desc;
   
-  cr = gtk_print_context_get_cairo (context);
+  cr = gtk_print_context_get_cairo_context (context);
 
   /* Draw a red rectangle, as wide as the paper (inside the margins) */
   cairo_set_source_rgb (cr, 1.0, 0, 0);
@@ -74,7 +74,7 @@ draw_page (GtkPrintOperation *operation,
 
   /* Draw some text */
   
-  layout = gtk_print_context_create_layout (context);
+  layout = gtk_print_context_create_pango_layout (context);
   pango_layout_set_text (layout, "Hello World! Printing is easy", -1);
   desc = pango_font_description_from_string ("sans 28");
   pango_layout_set_font_description (layout, desc);

diff --git a/tests/testprintfileoperation.c b/tests/testprintfileoperation.c
index e511eb3b69c885e80d6771d5b9db48f18947ba21..bbd27c40bcabcce62f846787d34820e43a13ab53 100644 (file)
--- a/tests/testprintfileoperation.c
+++ b/tests/testprintfileoperation.c
@@ -86,7 +86,7 @@ test_print_file_operation_draw_page (GtkPrintOperation *operation,
   PangoFontDescription *desc;
   char *page_str;
 
-  cr = gtk_print_context_get_cairo (context);
+  cr = gtk_print_context_get_cairo_context (context);
   width = gtk_print_context_get_width (context);
 
   cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
@@ -98,7 +98,7 @@ test_print_file_operation_draw_page (GtkPrintOperation *operation,
   cairo_set_line_width (cr, 1);
   cairo_stroke (cr);
 
-  layout = gtk_print_context_create_layout (context);
+  layout = gtk_print_context_create_pango_layout (context);
 
   desc = pango_font_description_from_string ("sans 14");
   pango_layout_set_font_description (layout, desc);
@@ -124,7 +124,7 @@ test_print_file_operation_draw_page (GtkPrintOperation *operation,
   
   g_object_unref (layout);
   
-  layout = gtk_print_context_create_layout (context);
+  layout = gtk_print_context_create_pango_layout (context);
   
   desc = pango_font_description_from_string ("mono");
   pango_font_description_set_size (desc, op->font_size * PANGO_SCALE);